Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Apr 2012 15:09:27 +0000 (08:09 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 7 Apr 2012 15:09:27 +0000 (08:09 -0700)
commit4b1bbae91ecd6e5d90bdb763f684df123df6ecb6
tree9f12043a14b3cf229ab33655ecd71773b813f8bf
parent020b69f2fae8d5a01df215f6443dd24e9ea714d8
parent5d05098de56b0a541ff3a966e9708050598442b7
Merge from trunk.